Merge tag 'upstream/1.0.2'
authorAron Xu <aron@debian.org>
Thu, 20 Nov 2014 09:03:20 +0000 (17:03 +0800)
committerAron Xu <aron@debian.org>
Thu, 20 Nov 2014 09:03:20 +0000 (17:03 +0800)
Upstream version 1.0.2


Trivial merge